Merge "Send 500 http status code, instead of 200, for DBConnectionErrors"

diff --combined includes/exception/MWExceptionRenderer.php
index a9bd4da,1412adb..0e743c1
--- 1/includes/exception/MWExceptionRenderer.php
--- 2/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@@ -19,11 -19,6 +19,11 @@@
   * @author Aaron Schulz
   */
  
 +use Wikimedia\Rdbms\DBConnectionError;
 +use Wikimedia\Rdbms\DBError;
 +use Wikimedia\Rdbms\DBReadOnlyError;
 +use Wikimedia\Rdbms\DBExpectedError;
 +
  /**
   * Class to expose exceptions to the client (API bots, users, admins using CLI scripts)
   * @since 1.28
@@@ -47,10 -42,10 +47,10 @@@ class MWExceptionRenderer 
                } elseif ( self::isCommandLine() ) {
                        self::printError( self::getText( $e ) );
                } elseif ( $mode === self::AS_PRETTY ) {
+                       self::statusHeader( 500 );
                        if ( $e instanceof DBConnectionError ) {
                                self::reportOutageHTML( $e );
                        } else {
-                               self::statusHeader( 500 );
                                self::header( "Content-Type: $wgMimeType; charset=utf-8" );
                                self::reportHTML( $e );
                        }